From 2103431eda670630877204374b9b4963fdc3a9a0 Mon Sep 17 00:00:00 2001 From: "kaf24@scramble.cl.cam.ac.uk" Date: Wed, 19 Nov 2003 23:05:17 +0000 Subject: [PATCH] bitkeeper revision 1.613 (3fbbf72duBrrL77JwhqU9DkVTwQtFA) Many files: Rename new library to 'xc' (Xen Control). xc.h: Rename: tools/libxc/xi.h -> tools/libxc/xc.h libxc_private.h: Rename: tools/libxc/libxi_private.h -> tools/libxc/libxc_private.h libxc_vif.c: Rename: tools/libxc/libxi_vif.c -> tools/libxc/libxc_vif.c libxc_vbd.c: Rename: tools/libxc/libxi_vbd.c -> tools/libxc/libxc_vbd.c libxc_private.c: Rename: tools/libxc/libxi_private.c -> tools/libxc/libxc_private.c libxc_misc.c: Rename: tools/libxc/libxi_misc.c -> tools/libxc/libxc_misc.c libxc_linux_restore.c: Rename: tools/libxc/libxi_linux_restore.c -> tools/libxc/libxc_linux_restore.c libxc_linux_save.c: Rename: tools/libxc/libxi_linux_save.c -> tools/libxc/libxc_linux_save.c libxc_linux_build.c: Rename: tools/libxc/libxi_linux_build.c -> tools/libxc/libxc_linux_build.c libxc_domain.c: Rename: tools/libxc/libxi_domain.c -> tools/libxc/libxc_domain.c libxc_bvtsched.c: Rename: tools/libxc/libxi_bvtsched.c -> tools/libxc/libxc_bvtsched.c Many files: mvdir --- .rootkeys | 26 +++---- tools/{libxi => libxc}/Makefile | 14 ++-- .../libxc_bvtsched.c} | 8 +- .../libxi_domain.c => libxc/libxc_domain.c} | 20 ++--- .../libxc_linux_build.c} | 6 +- .../libxc_linux_restore.c} | 6 +- .../libxc_linux_save.c} | 6 +- .../libxi_misc.c => libxc/libxc_misc.c} | 10 +-- .../libxi_private.c => libxc/libxc_private.c} | 4 +- .../libxi_private.h => libxc/libxc_private.h} | 8 +- .../{libxi/libxi_vbd.c => libxc/libxc_vbd.c} | 18 ++--- .../{libxi/libxi_vif.c => libxc/libxc_vif.c} | 16 ++-- tools/{libxi => libxc}/rpm.spec | 12 +-- tools/{libxi/xi.h => libxc/xc.h} | 76 +++++++++---------- 14 files changed, 115 insertions(+), 115 deletions(-) rename tools/{libxi => libxc}/Makefile (81%) rename tools/{libxi/libxi_bvtsched.c => libxc/libxc_bvtsched.c} (84%) rename tools/{libxi/libxi_domain.c => libxc/libxc_domain.c} (79%) rename tools/{libxi/libxi_linux_build.c => libxc/libxc_linux_build.c} (99%) rename tools/{libxi/libxi_linux_restore.c => libxc/libxc_linux_restore.c} (99%) rename tools/{libxi/libxi_linux_save.c => libxc/libxc_linux_save.c} (99%) rename tools/{libxi/libxi_misc.c => libxc/libxc_misc.c} (82%) rename tools/{libxi/libxi_private.c => libxc/libxc_private.c} (93%) rename tools/{libxi/libxi_private.h => libxc/libxc_private.h} (97%) rename tools/{libxi/libxi_vbd.c => libxc/libxc_vbd.c} (88%) rename tools/{libxi/libxi_vif.c => libxc/libxc_vif.c} (82%) rename tools/{libxi => libxc}/rpm.spec (66%) rename tools/{libxi/xi.h => libxc/xc.h} (53%) diff --git a/.rootkeys b/.rootkeys index 91e5c8213b..bbdd90398d 100644 --- a/.rootkeys +++ b/.rootkeys @@ -184,19 +184,19 @@ 3fb01fd5B-UeibZkmSCOUZckNyNFYA tools/internal/xi_vbd_list.c 3f86be322bd0h9jG3krZFOUgCDoxZg tools/internal/xi_vif_params.c 3eb781fd7211MZsLxJSiuy7W4KnJXg tools/internal/xi_vifinit -3fbba6dbDfYvJSsw9500b4SZyUhxjQ tools/libxi/Makefile -3fbba6dbEVkVMX0JuDFzap9jeaucGA tools/libxi/libxi_bvtsched.c -3fbba6dbasJQV-MVElDC0DGSHMiL5w tools/libxi/libxi_domain.c -3fbba6dbNCU7U6nsMYiXzKkp3ztaJg tools/libxi/libxi_linux_build.c -3fbba6dbl267zZOAVHYLOdLCdhcZMw tools/libxi/libxi_linux_restore.c -3fbba6db7li3FJiABYtCmuGxOJxEGw tools/libxi/libxi_linux_save.c -3fbba6db7WnnJr0KFrIFrqNlSKvFYg tools/libxi/libxi_misc.c -3fbba6dctWRWlFJkYb6hdix2X4WMuw tools/libxi/libxi_private.c -3fbba6dcbVrG2hPzEzwdeV_UC8kydQ tools/libxi/libxi_private.h -3fbba6dcoGq9hQlksrBUfC2P5F6sGg tools/libxi/libxi_vbd.c -3fbba6dc38q-ioRlwSR_quw4G3qUeQ tools/libxi/libxi_vif.c -3fbba6dc1uU7U3IFeF6A-XEOYF2MkQ tools/libxi/rpm.spec -3fbba6dcrNxtygEcgJYAJJ1gCQqfsA tools/libxi/xi.h +3fbba6dbDfYvJSsw9500b4SZyUhxjQ tools/libxc/Makefile +3fbba6dbEVkVMX0JuDFzap9jeaucGA tools/libxc/libxc_bvtsched.c +3fbba6dbasJQV-MVElDC0DGSHMiL5w tools/libxc/libxc_domain.c +3fbba6dbNCU7U6nsMYiXzKkp3ztaJg tools/libxc/libxc_linux_build.c +3fbba6dbl267zZOAVHYLOdLCdhcZMw tools/libxc/libxc_linux_restore.c +3fbba6db7li3FJiABYtCmuGxOJxEGw tools/libxc/libxc_linux_save.c +3fbba6db7WnnJr0KFrIFrqNlSKvFYg tools/libxc/libxc_misc.c +3fbba6dctWRWlFJkYb6hdix2X4WMuw tools/libxc/libxc_private.c +3fbba6dcbVrG2hPzEzwdeV_UC8kydQ tools/libxc/libxc_private.h +3fbba6dcoGq9hQlksrBUfC2P5F6sGg tools/libxc/libxc_vbd.c +3fbba6dc38q-ioRlwSR_quw4G3qUeQ tools/libxc/libxc_vif.c +3fbba6dc1uU7U3IFeF6A-XEOYF2MkQ tools/libxc/rpm.spec +3fbba6dcrNxtygEcgJYAJJ1gCQqfsA tools/libxc/xc.h 3f776bd2Xd-dUcPKlPN2vG89VGtfvQ tools/misc/Makefile 3f6dc136ZKOjd8PIqLbFBl_v-rnkGg tools/misc/miniterm/Makefile 3f6dc140C8tAeBfroAF24VrmCS4v_w tools/misc/miniterm/README diff --git a/tools/libxi/Makefile b/tools/libxc/Makefile similarity index 81% rename from tools/libxi/Makefile rename to tools/libxc/Makefile index b776fa83a2..7bc64e2199 100644 --- a/tools/libxi/Makefile +++ b/tools/libxc/Makefile @@ -4,12 +4,12 @@ CFLAGS = -c -Wall -O3 CFLAGS += -I../../xen/include -I../../xenolinux-sparse/include HDRS = $(wildcard *.h) -OBJS = $(patsubst %.c,%.o,$(wildcard libxi_*.c)) +OBJS = $(patsubst %.c,%.o,$(wildcard libxc_*.c)) -LIBS = libxi.a libxi.so +LIBS = libxc.a libxc.so all: check-for-zlib $(LIBS) - ranlib libxi.a + ranlib libxc.a check-for-zlib: @if [ ! -e /usr/include/zlib.h ]; then \ @@ -24,8 +24,8 @@ install: all mkdir -p ../../../install/include cp -a $(LIBS) ../../../install/lib for i in $(LIBS) do ; chmod 755 ../../../install/bin/$i ; done - cp -a xi.h ../../../install/include - chmod 644 ../../../install/include/xi.h + cp -a xc.h ../../../install/include + chmod 644 ../../../install/include/xc.h clean: $(RM) *.a *.so *.o *.rpm $(LIBS) @@ -39,10 +39,10 @@ rpm: all mv staging/i386/*.rpm . rm -rf staging -libxi.so: $(OBJS) +libxc.so: $(OBJS) $(LD) -shared -o $@ $^ -lz -libxi.a: libxi.a($(OBJS)) +libxc.a: libxc.a($(OBJS)) %.o: %.c $(HDRS) Makefile $(CC) $(CFLAGS) -o $@ $< diff --git a/tools/libxi/libxi_bvtsched.c b/tools/libxc/libxc_bvtsched.c similarity index 84% rename from tools/libxi/libxi_bvtsched.c rename to tools/libxc/libxc_bvtsched.c index af6fd17fcb..5230e96d2f 100644 --- a/tools/libxi/libxi_bvtsched.c +++ b/tools/libxc/libxc_bvtsched.c @@ -1,14 +1,14 @@ /****************************************************************************** - * libxi_bvtsched.c + * libxc_bvtsched.c * * API for manipulating parameters of the Borrowed Virtual Time scheduler. * * Copyright (c) 2003, K A Fraser. */ -#include "libxi_private.h" +#include "libxc_private.h" -int xi_bvtsched_global_set(unsigned long ctx_allow) +int xc_bvtsched_global_set(unsigned long ctx_allow) { dom0_op_t op; op.cmd = DOM0_BVTCTL; @@ -16,7 +16,7 @@ int xi_bvtsched_global_set(unsigned long ctx_allow) return do_dom0_op(&op); } -int xi_bvtsched_domain_set(unsigned int domid, +int xc_bvtsched_domain_set(unsigned int domid, unsigned long mcuadv, unsigned long warp, unsigned long warpl, diff --git a/tools/libxi/libxi_domain.c b/tools/libxc/libxc_domain.c similarity index 79% rename from tools/libxi/libxi_domain.c rename to tools/libxc/libxc_domain.c index ad75ef5701..a6c2906e43 100644 --- a/tools/libxi/libxi_domain.c +++ b/tools/libxc/libxc_domain.c @@ -1,14 +1,14 @@ /****************************************************************************** - * libxi_domain.c + * libxc_domain.c * * API for manipulating and obtaining information on domains. * * Copyright (c) 2003, K A Fraser. */ -#include "libxi_private.h" +#include "libxc_private.h" -int xi_domain_create(unsigned int mem_kb, const char *name) +int xc_domain_create(unsigned int mem_kb, const char *name) { int err; dom0_op_t op; @@ -24,7 +24,7 @@ int xi_domain_create(unsigned int mem_kb, const char *name) } -int xi_domain_start(unsigned int domid) +int xc_domain_start(unsigned int domid) { dom0_op_t op; op.cmd = DOM0_STARTDOMAIN; @@ -33,7 +33,7 @@ int xi_domain_start(unsigned int domid) } -int xi_domain_stop(unsigned int domid) +int xc_domain_stop(unsigned int domid) { dom0_op_t op; op.cmd = DOM0_STOPDOMAIN; @@ -42,7 +42,7 @@ int xi_domain_stop(unsigned int domid) } -int xi_domain_destroy(unsigned int domid, int force) +int xc_domain_destroy(unsigned int domid, int force) { dom0_op_t op; op.cmd = DOM0_DESTROYDOMAIN; @@ -51,9 +51,9 @@ int xi_domain_destroy(unsigned int domid, int force) return do_dom0_op(&op); } -int xi_domain_getinfo(unsigned int first_domid, +int xc_domain_getinfo(unsigned int first_domid, unsigned int max_doms, - xi_dominfo_t *info) + xc_dominfo_t *info) { unsigned int nr_doms, next_domid = first_domid; dom0_op_t op; @@ -70,8 +70,8 @@ int xi_domain_getinfo(unsigned int first_domid, info->stopped = (op.u.getdomaininfo.state == DOMSTATE_STOPPED); info->nr_pages = op.u.getdomaininfo.tot_pages; info->cpu_time = op.u.getdomaininfo.cpu_time; - strncpy(info->name, op.u.getdomaininfo.name, XI_DOMINFO_MAXNAME); - info->name[XI_DOMINFO_MAXNAME-1] = '\0'; + strncpy(info->name, op.u.getdomaininfo.name, XC_DOMINFO_MAXNAME); + info->name[XC_DOMINFO_MAXNAME-1] = '\0'; next_domid = op.u.getdomaininfo.domain + 1; } diff --git a/tools/libxi/libxi_linux_build.c b/tools/libxc/libxc_linux_build.c similarity index 99% rename from tools/libxi/libxi_linux_build.c rename to tools/libxc/libxc_linux_build.c index ff9bd354eb..a1e4227913 100644 --- a/tools/libxi/libxi_linux_build.c +++ b/tools/libxc/libxc_linux_build.c @@ -1,8 +1,8 @@ /****************************************************************************** - * libxi_linux_build.c + * libxc_linux_build.c */ -#include "libxi_private.h" +#include "libxc_private.h" #include /* This string is written to the head of every guest kernel image. */ @@ -312,7 +312,7 @@ static int setup_guestos( return -1; } -int xi_domain_build(unsigned int domid, +int xc_domain_build(unsigned int domid, const char *image_name, const char *ramdisk_name, const char *cmdline, diff --git a/tools/libxi/libxi_linux_restore.c b/tools/libxc/libxc_linux_restore.c similarity index 99% rename from tools/libxi/libxi_linux_restore.c rename to tools/libxc/libxc_linux_restore.c index 25d927a95d..6afa2e2df8 100644 --- a/tools/libxi/libxi_linux_restore.c +++ b/tools/libxc/libxc_linux_restore.c @@ -1,12 +1,12 @@ /****************************************************************************** - * libxi_linux_restore.c + * libxc_linux_restore.c * * Restore the state of a Xenolinux session. * * Copyright (c) 2003, K A Fraser. */ -#include "libxi_private.h" +#include "libxc_private.h" #include #include @@ -97,7 +97,7 @@ static int checked_read(gzFile fd, void *buf, size_t count) return rc == count; } -int xi_linux_restore(const char *state_file, int verbose) +int xc_linux_restore(const char *state_file, int verbose) { dom0_op_t op; int rc = 1, i, j; diff --git a/tools/libxi/libxi_linux_save.c b/tools/libxc/libxc_linux_save.c similarity index 99% rename from tools/libxi/libxi_linux_save.c rename to tools/libxc/libxc_linux_save.c index d651ba44b2..77edfc6ae7 100644 --- a/tools/libxi/libxi_linux_save.c +++ b/tools/libxc/libxc_linux_save.c @@ -1,12 +1,12 @@ /****************************************************************************** - * libxi_linux_save.c + * libxc_linux_save.c * * Save the state of a running Xenolinux session. * * Copyright (c) 2003, K A Fraser. */ -#include "libxi_private.h" +#include "libxc_private.h" #include #include @@ -70,7 +70,7 @@ static int checked_write(gzFile fd, void *buf, size_t count) return rc == count; } -int xi_linux_save(unsigned int domid, const char *state_file, int verbose) +int xc_linux_save(unsigned int domid, const char *state_file, int verbose) { dom0_op_t op; int rc = 1, i, j; diff --git a/tools/libxi/libxi_misc.c b/tools/libxc/libxc_misc.c similarity index 82% rename from tools/libxi/libxi_misc.c rename to tools/libxc/libxc_misc.c index c8046283c1..351fb26671 100644 --- a/tools/libxi/libxi_misc.c +++ b/tools/libxc/libxc_misc.c @@ -1,14 +1,14 @@ /****************************************************************************** - * libxi_misc.c + * libxc_misc.c * * Miscellaneous control interface functions. */ -#include "libxi_private.h" +#include "libxc_private.h" int privcmd_fd = -1; -int xi_interface_open(void) +int xc_interface_open(void) { if ( (privcmd_fd == -1) && ((privcmd_fd = open("/proc/xeno/privcmd", O_RDWR)) < 0) ) @@ -19,7 +19,7 @@ int xi_interface_open(void) return 0; } -int xi_interface_close(void) +int xc_interface_close(void) { if ( privcmd_fd != -1 ) { @@ -32,7 +32,7 @@ int xi_interface_close(void) #define CONSOLE_RING_CLEAR 1 -int xi_readconsolering(char *str, unsigned int max_chars, int clear) +int xc_readconsolering(char *str, unsigned int max_chars, int clear) { int ret; dom0_op_t op; diff --git a/tools/libxi/libxi_private.c b/tools/libxc/libxc_private.c similarity index 93% rename from tools/libxi/libxi_private.c rename to tools/libxc/libxc_private.c index 9f9ace41c5..c4c9c8b16d 100644 --- a/tools/libxi/libxi_private.c +++ b/tools/libxc/libxc_private.c @@ -1,10 +1,10 @@ /****************************************************************************** - * libxi_private.c + * libxc_private.c * * Helper functions for the rest of the library. */ -#include "libxi_private.h" +#include "libxc_private.h" static int devmem_fd = -1; diff --git a/tools/libxi/libxi_private.h b/tools/libxc/libxc_private.h similarity index 97% rename from tools/libxi/libxi_private.h rename to tools/libxc/libxc_private.h index 2e75a05535..d1994f5431 100644 --- a/tools/libxi/libxi_private.h +++ b/tools/libxc/libxc_private.h @@ -1,6 +1,6 @@ -#ifndef __LIBXI_PRIVATE_H__ -#define __LIBXI_PRIVATE_H__ +#ifndef __LIBXC_PRIVATE_H__ +#define __LIBXC_PRIVATE_H__ typedef unsigned char u8; typedef unsigned short u16; @@ -23,7 +23,7 @@ typedef signed long long s64; #include #include -#include "xi.h" +#include "xc.h" #include #include @@ -152,4 +152,4 @@ int init_pfn_mapper(void); void *map_pfn(unsigned long pfn); void unmap_pfn(void *vaddr); -#endif /* __LIBXI_PRIVATE_H__ */ +#endif /* __LIBXC_PRIVATE_H__ */ diff --git a/tools/libxi/libxi_vbd.c b/tools/libxc/libxc_vbd.c similarity index 88% rename from tools/libxi/libxi_vbd.c rename to tools/libxc/libxc_vbd.c index 863f96ca13..c255f5b29b 100644 --- a/tools/libxi/libxi_vbd.c +++ b/tools/libxc/libxc_vbd.c @@ -1,5 +1,5 @@ /****************************************************************************** - * libxi_vbd.c + * libxc_vbd.c * * API for manipulating and accessing per-domain virtual block devices. * @@ -7,9 +7,9 @@ */ #define _GNU_SOURCE -#include "libxi_private.h" +#include "libxc_private.h" -int xi_vbd_create(unsigned int domid, unsigned short vbdid, int writeable) +int xc_vbd_create(unsigned int domid, unsigned short vbdid, int writeable) { block_io_op_t op; op.cmd = BLOCK_IO_OP_VBD_CREATE; @@ -20,7 +20,7 @@ int xi_vbd_create(unsigned int domid, unsigned short vbdid, int writeable) } -int xi_vbd_destroy(unsigned int domid, unsigned short vbdid) +int xc_vbd_destroy(unsigned int domid, unsigned short vbdid) { block_io_op_t op; op.cmd = BLOCK_IO_OP_VBD_DELETE; @@ -30,7 +30,7 @@ int xi_vbd_destroy(unsigned int domid, unsigned short vbdid) } -int xi_vbd_add_extent(unsigned int domid, +int xc_vbd_add_extent(unsigned int domid, unsigned short vbdid, unsigned short real_device, unsigned long start_sector, @@ -47,7 +47,7 @@ int xi_vbd_add_extent(unsigned int domid, } -int xi_vbd_delete_extent(unsigned int domid, +int xc_vbd_delete_extent(unsigned int domid, unsigned short vbdid, unsigned short real_device, unsigned long start_sector, @@ -64,10 +64,10 @@ int xi_vbd_delete_extent(unsigned int domid, } -int xi_vbd_probe(unsigned int domid, +int xc_vbd_probe(unsigned int domid, unsigned short vbdid, unsigned int max_vbds, - xi_vbd_t *vbds) + xc_vbd_t *vbds) { block_io_op_t op; xen_disk_info_t *xdi = &op.u.probe_params.xdi; @@ -101,7 +101,7 @@ int xi_vbd_probe(unsigned int domid, vbds[j].domid = xdi->disks[i].domain; vbds[j].vbdid = xdi->disks[i].device; vbds[j].flags = (xdi->disks[i].info & XD_FLAG_RO) ? - 0 : XI_VBDF_WRITEABLE; + 0 : XC_VBDF_WRITEABLE; vbds[j].nr_sectors = xdi->disks[i].capacity; j++; diff --git a/tools/libxi/libxi_vif.c b/tools/libxc/libxc_vif.c similarity index 82% rename from tools/libxi/libxi_vif.c rename to tools/libxc/libxc_vif.c index c95b45c030..c9d35e5611 100644 --- a/tools/libxi/libxi_vif.c +++ b/tools/libxc/libxc_vif.c @@ -1,16 +1,16 @@ /****************************************************************************** - * libxi_vif.c + * libxc_vif.c * * API for manipulating and accessing per-network-interface parameters. * * Copyright (c) 2003, K A Fraser. */ -#include "libxi_private.h" +#include "libxc_private.h" -int xi_vif_scheduler_set(unsigned int domid, +int xc_vif_scheduler_set(unsigned int domid, unsigned int vifid, - xi_vif_sched_params_t *params) + xc_vif_sched_params_t *params) { network_op_t netop; netop.cmd = NETWORK_OP_VIFSETPARAMS; @@ -22,9 +22,9 @@ int xi_vif_scheduler_set(unsigned int domid, } -int xi_vif_scheduler_get(unsigned int domid, +int xc_vif_scheduler_get(unsigned int domid, unsigned int vifid, - xi_vif_sched_params_t *params) + xc_vif_sched_params_t *params) { network_op_t netop; int rc; @@ -43,9 +43,9 @@ int xi_vif_scheduler_get(unsigned int domid, } -int xi_vif_stats_get(unsigned int domid, +int xc_vif_stats_get(unsigned int domid, unsigned int vifid, - xi_vif_stats_t *stats) + xc_vif_stats_t *stats) { network_op_t netop; int rc; diff --git a/tools/libxi/rpm.spec b/tools/libxc/rpm.spec similarity index 66% rename from tools/libxi/rpm.spec rename to tools/libxc/rpm.spec index 1a8f42a936..1b4c5fc85a 100644 --- a/tools/libxi/rpm.spec +++ b/tools/libxc/rpm.spec @@ -12,17 +12,17 @@ Library to make it easier to access the Xen control interfaces. %preun %install install -m 0755 -d $RPM_BUILD_ROOT/lib -install -m 0755 libxi.a $RPM_BUILD_ROOT/lib/libxi.a -install -m 0755 libxi.so $RPM_BUILD_ROOT/lib/libxi.so +install -m 0755 libxc.a $RPM_BUILD_ROOT/lib/libxc.a +install -m 0755 libxc.so $RPM_BUILD_ROOT/lib/libxc.so install -m 0755 -d $RPM_BUILD_ROOT/include -install -m 0644 xi.h $RPM_BUILD_ROOT/include/xi.h +install -m 0644 xc.h $RPM_BUILD_ROOT/include/xc.h %clean %post %postun %files %defattr(-,root,root) %dir /lib -/lib/libxi.a -/lib/libxi.so +/lib/libxc.a +/lib/libxc.so %dir /include -/include/xi.h +/include/xc.h diff --git a/tools/libxi/xi.h b/tools/libxc/xc.h similarity index 53% rename from tools/libxi/xi.h rename to tools/libxc/xc.h index 6b167bb212..73934ada6b 100644 --- a/tools/libxi/xi.h +++ b/tools/libxc/xc.h @@ -1,16 +1,16 @@ /****************************************************************************** - * xi.h + * xc.h * * A library for low-level access to the Xen control interfaces. * * Copyright (c) 2003, K A Fraser. */ -#ifndef __XI_H__ -#define __XI_H__ +#ifndef __XC_H__ +#define __XC_H__ -int xi_interface_open(void); -int xi_interface_close(void); +int xc_interface_open(void); +int xc_interface_close(void); typedef struct { unsigned int domid; @@ -19,28 +19,28 @@ typedef struct { int stopped; unsigned long nr_pages; unsigned long long cpu_time; -#define XI_DOMINFO_MAXNAME 16 - char name[XI_DOMINFO_MAXNAME]; -} xi_dominfo_t; +#define XC_DOMINFO_MAXNAME 16 + char name[XC_DOMINFO_MAXNAME]; +} xc_dominfo_t; -int xi_domain_create(unsigned int mem_kb, const char *name); -int xi_domain_start(unsigned int domid); -int xi_domain_stop(unsigned int domid); -int xi_domain_destroy(unsigned int domid, int force); -int xi_domain_getinfo(unsigned int first_domid, +int xc_domain_create(unsigned int mem_kb, const char *name); +int xc_domain_start(unsigned int domid); +int xc_domain_stop(unsigned int domid); +int xc_domain_destroy(unsigned int domid, int force); +int xc_domain_getinfo(unsigned int first_domid, unsigned int max_doms, - xi_dominfo_t *info); + xc_dominfo_t *info); -int xi_linux_save(unsigned int domid, const char *state_file, int verbose); -int xi_linux_restore(const char *state_file, int verbose); -int xi_linux_build(unsigned int domid, +int xc_linux_save(unsigned int domid, const char *state_file, int verbose); +int xc_linux_restore(const char *state_file, int verbose); +int xc_linux_build(unsigned int domid, const char *image_name, const char *ramdisk_name, const char *cmdline, int verbose); -int xi_bvtsched_global_set(unsigned long ctx_allow); -int xi_bvtsched_domain_set(unsigned int domid, +int xc_bvtsched_global_set(unsigned long ctx_allow); +int xc_bvtsched_domain_set(unsigned int domid, unsigned long mcuadv, unsigned long warp, unsigned long warpl, @@ -49,51 +49,51 @@ int xi_bvtsched_domain_set(unsigned int domid, typedef struct { unsigned long credit_bytes; unsigned long credit_usec; -} xi_vif_sched_params_t; +} xc_vif_sched_params_t; typedef struct { unsigned long long tx_bytes, tx_pkts; unsigned long long rx_bytes, rx_pkts; -} xi_vif_stats_t; +} xc_vif_stats_t; -int xi_vif_scheduler_set(unsigned int domid, +int xc_vif_scheduler_set(unsigned int domid, unsigned int vifid, - xi_vif_sched_params_t *params); -int xi_vif_scheduler_get(unsigned int domid, + xc_vif_sched_params_t *params); +int xc_vif_scheduler_get(unsigned int domid, unsigned int vifid, - xi_vif_sched_params_t *params); -int xi_vif_stats_get(unsigned int domid, + xc_vif_sched_params_t *params); +int xc_vif_stats_get(unsigned int domid, unsigned int vifid, - xi_vif_stats_t *stats); + xc_vif_stats_t *stats); typedef struct { -#define XI_VBDDOM_PROBE_ALL (~0U) +#define XC_VBDDOM_PROBE_ALL (~0U) unsigned int domid; unsigned short vbdid; -#define XI_VBDF_WRITEABLE (1<<0) +#define XC_VBDF_WRITEABLE (1<<0) unsigned long flags; unsigned long nr_sectors; -} xi_vbd_t; +} xc_vbd_t; -int xi_vbd_create(unsigned int domid, unsigned short vbdid, int writeable); -int xi_vbd_destroy(unsigned int domid, unsigned short vbdid); -int xi_vbd_add_extent(unsigned int domid, +int xc_vbd_create(unsigned int domid, unsigned short vbdid, int writeable); +int xc_vbd_destroy(unsigned int domid, unsigned short vbdid); +int xc_vbd_add_extent(unsigned int domid, unsigned short vbdid, unsigned short real_device, unsigned long start_sector, unsigned long nr_sectors); -int xi_vbd_delete_extent(unsigned int domid, +int xc_vbd_delete_extent(unsigned int domid, unsigned short vbdid, unsigned short real_device, unsigned long start_sector, unsigned long nr_sectors); -int xi_vbd_probe(unsigned int domid, +int xc_vbd_probe(unsigned int domid, unsigned short vbdid, unsigned int max_vbds, - xi_vbd_t *vbds); + xc_vbd_t *vbds); -int xi_readconsolering(char *str, unsigned int max_chars, int clear); +int xc_readconsolering(char *str, unsigned int max_chars, int clear); -#endif /* __XI_H__ */ +#endif /* __XC_H__ */ -- 2.30.2